fix: Remove apple uploads from intel#2645
Merged
noahsmartin merged 1 commit intomasterfrom Jul 29, 2025
Merged
Conversation
noahsmartin
force-pushed
the
addMacos13Matrix
branch
3 times, most recently
from
be7c74e to
54ff1af
Compare
noahsmartin
force-pushed
the
addMacos13Matrix
branch
12 times, most recently
from
af040ed to
d886635
Compare
Member
szokeasaurusrex
left a comment
szokeasaurusrex
left a comment
There was a problem hiding this comment.
Left a couple comments, but this is not a full review, as the PR is still marked as draft
apple-catalog-parsing/build.rs
Outdated
Comment on lines
+97
to
+100
|
|
||
| let lib_dir = "/usr/lib/swift"; | ||
| println!("cargo:rustc-link-arg=-Wl,-rpath"); | ||
| println!("cargo:rustc-link-arg=-Wl,{lib_dir}"); |
Member
There was a problem hiding this comment.
This would no longer be necessary if we restrict to ARM, correct?
Member
There was a problem hiding this comment.
Or wait, this is the crate's build.rs, so I don't think these directives have any effect here
.github/workflows/test.yml
Outdated
Comment on lines
+45
to
+115
| cross-platform-test: | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| os: [macos-14, macos-14-large] | ||
| feature-args: ['', '-Funstable-mobile-app'] | ||
| include: | ||
| - feature-args: '' | ||
| feature-suffix: '' | ||
| - feature-args: '-Funstable-mobile-app' | ||
| feature-suffix: ' (-Funstable-mobile-app)' | ||
|
|
||
| name: Build on macOS 14, Test on macOS 13${{ matrix.feature-suffix }} | ||
| runs-on: ${{ matrix.os }} | ||
|
|
||
| steps: | ||
| - name: Checkout Repository | ||
| uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2 | ||
|
|
||
| - name: Cache Dependencies | ||
| uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # 2.8.0 | ||
|
|
||
| - name: Build on macOS 14 | ||
| run: cargo build --release --workspace ${{ matrix.feature-args }} | ||
|
|
||
| - name: Upload Build Artifacts | ||
| uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2 | ||
| with: | ||
| name: sentry-cli-macos14-build${{ matrix.feature-suffix }}-${{ matrix.os }} | ||
| path: target/release/sentry-cli | ||
| retention-days: 1 | ||
|
|
||
| cross-platform-test-runner: | ||
| needs: cross-platform-test | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| os: [macos-13, macos-13-xlarge, macos-15-large] | ||
| feature-args: ['', '-Funstable-mobile-app'] | ||
| include: | ||
| - os: macos-13 | ||
| base-os: macos-14-large | ||
| - os: macos-13-xlarge | ||
| base-os: macos-14 | ||
| - os: macos-15-large | ||
| base-os: macos-14-large | ||
| - feature-args: '' | ||
| feature-suffix: '' | ||
| - feature-args: '-Funstable-mobile-app' | ||
| feature-suffix: ' (-Funstable-mobile-app)' | ||
|
|
||
| name: Run macOS ${{ matrix.os }} ${{ matrix.feature-suffix }} | ||
| runs-on: ${{ matrix.os }} | ||
|
|
||
| steps: | ||
| - name: Checkout Repository | ||
| uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2 | ||
|
|
||
| - name: Download Build Artifacts | ||
| uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # 4.3.0 | ||
| with: | ||
| name: sentry-cli-macos14-build${{ matrix.feature-suffix }}-${{ matrix.base-os }} | ||
| path: ./bin | ||
|
|
||
| - name: Make Binary Executable | ||
| run: chmod +x ./bin/sentry-cli | ||
|
|
||
| - name: Test Binary Compatibility | ||
| run: | | ||
| # Ensure the cli runs | ||
| ./bin/sentry-cli --help |
Member
There was a problem hiding this comment.
If we will make this feature ARM-specific, we should have test coverage for both the ARM-binary and the x86_64-binary; however, I would prefer that we try to keep it simpler than this (i.e. depending on fewer runner types, and perhaps only testing on the system we build for).
noahsmartin
force-pushed
the
addMacos13Matrix
branch
from
d1ca32a to
6c59e8f
Compare
noahsmartin
changed the title
Member
szokeasaurusrex
left a comment
szokeasaurusrex
left a comment
There was a problem hiding this comment.
Looks good, besides comment about testing. I would be good to approve if we rebase this on #2658 and remove the macos-14-large image
noahsmartin
force-pushed
the
addMacos13Matrix
branch
from
6c59e8f to
d75295c
Compare
noahsmartin
force-pushed
the
addMacos13Matrix
branch
from
d75295c to
f6eca50
Compare
noahsmartin
changed the base branch from
master
to
07-28-ci_test_and_lint_macos_x86_64
szokeasaurusrex
changed the title
szokeasaurusrex
approved these changes
Jul 29, 2025
Member
|
Looks good; however, CI is failing on #2658 (which this PR is depending on), since that PR needs this PR in order to pass. So, we will need to reorder the two PRs to the following: Would you like to take care of this reordering or shall I? |
noahsmartin
changed the base branch from
07-28-ci_test_and_lint_macos_x86_64
to
master
8 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adding a test runner for intel macOS, also fixes the issue with intel macOS and the mobile app command by disabling the iOS features on intel